* erc-backend.el (erc-server-JOIN): Set the correct target list on join.

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 4143893008f6daed38b0897b6b093693d74b33ec..6eacc03555276b73a04068b37351a5651a2cc3fb 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-23  Julien Danjou  <julien@danjou.info>
 
+       * erc-backend.el (erc-server-JOIN): Set the correct target list on join.
+
        * erc-backend.el (erc-process-sentinel): Check that buffer is alive
        before setting it as current buffer.
 

diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 92b1c761a30e05e3855d3bf570b851cbd93ac98f..f9c74a7af3e79a9b3a6e5cdfc1d34fe79a9ded55 100644 (file)
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1195,7 +1195,7 @@ add things to `%s' instead."
                       (setq buffer (erc-open erc-session-server erc-session-port
                                              nick erc-session-user-full-name
                                              nil nil
-                                             erc-default-recipients chnl
+                                             (list chnl) chnl
                                              erc-server-process))
                       (when buffer
                         (set-buffer buffer)